From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Thu, 29 Jan 2026 20:50:42 +0000 (+0100)
Subject: cross
X-Git-Tag: archive/raspbian/6.9.2+dfsg-4+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com//%22mailto:sonu.itbhu%40googlemail.com/%22/%22http:/www.example.com/%22mailto:sonu.itbhu%40googlemail.com/%22?a=commitdiff_plain;h=0fd5f05e5d4e0f7ae3639a9c1b182e9fac5793b3;p=qt6-base.git

cross


Gbp-Pq: Name cross.patch
---

diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
index 06d7d532d..246771df0 100644
--- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt
@@ -15,6 +15,6 @@ if(TARGET Qt6::Xml)
     qt_internal_add_example(masterdetail)
 endif()
 
-if(NOT CMAKE_CROSSCOMPILING)
+if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
     qt_internal_add_example(sqlbrowser)
 endif()
diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake
index 618dc09f3..291a047f7 100644
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -5,7 +5,7 @@ qt_feature("androiddeployqt" PRIVATE
     SECTION "Deployment"
     LABEL "Android deployment tool"
     PURPOSE "The Android deployment tool automates the process of creating Android packages."
-    CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
 
 qt_feature("macdeployqt" PRIVATE
     SECTION "Deployment"